Merge branch 'master' of https://github.com/rust-lang/cargo into fix-example-metadata
authorKalita Alexey <kalita.alexey@outlook.com>
Thu, 9 Feb 2017 17:04:57 +0000 (20:04 +0300)
committerKalita Alexey <kalita.alexey@outlook.com>
Thu, 9 Feb 2017 17:04:57 +0000 (20:04 +0300)

Trivial merge